From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 10 Oct 2014 08:58:42 +0000 (+0200)
Subject: overviewControls: Really fix x align
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2035
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=aa3caff7143916e9e63cd9dae13e54be7b861c83;p=gnome-shell.git

overviewControls: Really fix x align

Commit a4475465f1f2 fixed the wrong alignment for the fully visible
control, but regressed the partially slid-out one; take the slideX
factor into account to get the right offset for both cases.
---

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 5dd2be4ae..b5f60de05 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -64,7 +64,8 @@ const SlideLayout = new Lang.Class({
         // flags only determine what to do if the allocated box is bigger
         // than the actor's box.
         let realDirection = getRtlSlideDirection(this._direction, child);
-        let alignX = (realDirection == SlideDirection.RIGHT) ? (availWidth - natWidth) : 0;
+        let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth)
+                                                            : (availWidth - natWidth * this._slideX);
 
         let actorBox = new Clutter.ActorBox();
         actorBox.x1 = box.x1 + alignX + this._translationX;